Fix for CRM-15332