Merge pull request #10159 from colemanw/CRM-20425