Merge pull request #1141 from kurund/CRM-12965