2.3. Major upgrades

2.3.1. Upgrade preparations