CRM-14436 : upgrade