Preferences and UpgradeState hotfixes