Merge pull request #9973 from lcdservices/CRM-19469