am 677d5c9a: Speed up schema update

* commit '677d5c9a353fd956c9cb981ca38d9fb351c0421d':
  Speed up schema update