Merge pull request #17230 from asmorkalov:as/issue_17171
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 12 May 2020 10:53:23 +0000 (10:53 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 12 May 2020 10:53:23 +0000 (10:53 +0000)

Trivial merge