Merge pull request #10065 from colemanw/CRM-19778