Merge pull request #1293 from kurund/CRM-13130