Merge pull request #17655 from samuelsov/lab1827