Merge pull request #19833 from alalek:workaround_19678
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Apr 2021 10:37:29 +0000 (10:37 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Apr 2021 10:37:29 +0000 (10:37 +0000)

Trivial merge