Merge pull request #2207 from lcdservices/CRM-13920