Merge pull request #19210 from alalek:backport_19199
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 24 Dec 2020 10:01:37 +0000 (10:01 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 24 Dec 2020 10:01:37 +0000 (10:01 +0000)

Trivial merge