Merge pull request #6380 from colemanw/CRM-16478