Merge pull request #1062 from kurund/CRM-12964