Merge pull request #19607 from alalek:backport_19606
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 3 Mar 2021 21:10:57 +0000 (21:10 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 3 Mar 2021 21:10:57 +0000 (21:10 +0000)

Trivial merge