Merge pull request #2129 from lcdservices/CRM-13883