Merge pull request #18260 from alalek:static_code_fixes_2
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 Sep 2020 21:25:38 +0000 (21:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 Sep 2020 21:25:38 +0000 (21:25 +0000)

Trivial merge