Merge pull request #7612 from colemanw/CRM-17429