Merge pull request #8548 from fuzionnz/CRM-18811