Merge pull request #6332 from colemanw/CRM-11856