Merge pull request #9419 from colemanw/CRM-19649