Merge pull request #7114 from mollux/CRM-16029