Merge pull request #6122 from marcov4lente/CRM-16789