CRM-13965 : upgrade modifications