Merge pull request #7761 from lcdservices/CRM-17988