Merge pull request #11323 from samuelsov/CRM-21478