CRM-12964-upgrade-handling