Avoid validation in finalizer when testing previous schema upgrades.
Merge remote-tracking branch 'origin/master' into 1722-toolbar-update