Merge pull request #9899 from colemanw/CRM-20179