Merge pull request #6310 from colemanw/CRM-9084