Merge pull request #20346 from alalek:backport_20026
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 3 Jul 2021 00:27:54 +0000 (00:27 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 3 Jul 2021 00:27:55 +0000 (00:27 +0000)

Trivial merge