Merge pull request #4048 from mikhailprivalov/create-pull-request/patch

Merge pull request #4048 from mikhailprivalov/create-pull-request/patch #33198