Merge pull request #6077 from onlyjob/CRM-16731