CRM-15317: full fix