Merge pull request #17509 from mshabunin:fix-kw-issues
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 9 Jun 2020 11:11:39 +0000 (11:11 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 9 Jun 2020 11:11:39 +0000 (11:11 +0000)

Trivial merge