Merge pull request #1143 from kurund/CRM-12965