Merge pull request #9023 from lcdservices/CRM-19354