Merge pull request #18518 from alalek:backport_17993
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 6 Oct 2020 22:47:45 +0000 (22:47 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 6 Oct 2020 22:47:45 +0000 (22:47 +0000)

Trivial merge