Merge pull request #17766 from alalek:backport_17756
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 6 Jul 2020 21:50:23 +0000 (21:50 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 6 Jul 2020 21:50:24 +0000 (21:50 +0000)

Trivial merge