Merge fix - CRM-15764