Merge pull request #6375 from colemanw/CRM-16172