Fix conservative upgrades.
Merge branch 'master' into osx/main