Merge pull request #7111 from kurund/CRM-17393