Merge pull request #8265 from mollux/CRM-17983-v2