Merge pull request #1340 from kurund/CRM-13156