Merge pull request #10802 from lcdservices/CRM-21004