Merge pull request #17557 from alalek:backport_17554
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Jun 2020 19:26:11 +0000 (19:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Jun 2020 19:26:11 +0000 (19:26 +0000)

Trivial merge