Merge pull request #6351 from colemanw/CRM-16645