Merge pull request #19831 from alalek:backport_19771
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Apr 2021 14:05:09 +0000 (14:05 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Apr 2021 14:05:09 +0000 (14:05 +0000)

Trivial merge