Merge pull request #6846 from colemanw/CRM-16444