Merge pull request #4208 from lcdservices/CRM-15351