Require autoConfigure on for upgrading.
Merge branch 'release-2.3'