Merge pull request #6921 from kurund/CRM-16785