Merge pull request #19707 from AsyaPronina:asyadev/upstream_fixes_from_release
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 12 Mar 2021 14:27:41 +0000 (14:27 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 12 Mar 2021 14:27:41 +0000 (14:27 +0000)

Trivial merge