Merge pull request #19718 from alalek:backport_19683
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 13 Mar 2021 12:46:24 +0000 (12:46 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 13 Mar 2021 12:46:24 +0000 (12:46 +0000)

Trivial merge