Merge pull request #10912 from lcdservices/CRM-21114