Merge pull request #6156 from colemanw/CRM-16645