Merge pull request #4607 from samuelsov/CRM-15637