Merge pull request #8615 from bsilvern/crm-18805