Merge pull request #19454 from nullaus/bug1007965

bug 1007965(cherry picked from commit 69790f4d8f787b8f4dbda4a9eb2c03bff254b3eb)
Merge pull request #19569 from nullaus/v1.4

Merge pull request #19454 from nullaus/bug1007965