Merge pull request #19582 from alalek:backport_19572
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 20 Feb 2021 22:46:55 +0000 (22:46 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 20 Feb 2021 22:46:55 +0000 (22:46 +0000)

Trivial merge