Merge pull request #6212 from colemanw/CRM-16354