Merge pull request #6376 from colemanw/CRM-16337