Merge pull request #19812 from alalek:workaround_19634
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 31 Mar 2021 22:57:15 +0000 (22:57 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 31 Mar 2021 22:57:15 +0000 (22:57 +0000)

Trivial merge