Merge pull request #22617 from changh95:4.x
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Oct 2022 09:17:15 +0000 (09:17 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 14 Oct 2022 09:17:16 +0000 (09:17 +0000)

Trivial merge