Merge pull request #1823 from lcdservices/CRM-13628