Merge pull request #8166 from otetard/CRM-18432