Merge branch 'better-upgrade-strategy'
Merge branch 'shell-env-fix'