Merge pull request #18719 from dmatveev:dm/upstream_desync_fix
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 5 Nov 2020 11:20:08 +0000 (11:20 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 5 Nov 2020 11:20:08 +0000 (11:20 +0000)

Trivial merge