Merge pull request #2029 from kurund/CRM-11301