Merge pull request #19081 from nullaus/bug1001702

bug 1001702(cherry picked from commit c1a8cbaac1d921cfb50e3a2600720b75cf5afabd)
Merge pull request #19119 from nullaus/v1.4

Merge pull request #19081 from nullaus/bug1001702