CRM-13912: upgrade fix