Merge pull request #20328 from alalek:backport_20321
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 30 Jun 2021 20:51:49 +0000 (20:51 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 30 Jun 2021 20:51:49 +0000 (20:51 +0000)

Trivial merge