Merge pull request #9154 from colemanw/CRM-19368