Merge pull request #2111 from lcdservices/CRM-13851