Merge pull request #9696 from colemanw/CRM-19893