Merge pull request #20240 from alalek:fixup_20149_4.x
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 8 Jun 2021 13:44:24 +0000 (13:44 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 8 Jun 2021 13:44:24 +0000 (13:44 +0000)

Trivial merge