Merge pull request #3100 from kurund/CRM-14563