Merge pull request #20344 from alalek:backport_20343
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Jul 2021 23:35:12 +0000 (23:35 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Jul 2021 23:35:12 +0000 (23:35 +0000)

Trivial merge