Merge pull request #1123 from kurund/CRM-12966