Merge pull request #9948 from KarinG/CRM-19966