Merge pull request #1217 from samuelsov/CRM-10606