Merge pull request #1119 from kurund/CRM-12966