Merge pull request #17887 from ilyachur:revert-17872-feature/ichuraev/1324
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 20 Jul 2020 16:15:49 +0000 (16:15 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 20 Jul 2020 16:15:49 +0000 (16:15 +0000)

Trivial merge