Merge pull request #6565 from colemanw/CRM-17013