Merge pull request #18698 from nullaus/bug999511

bug 999511(cherry picked from commit 725a23802708eb70e3d7e8a2ce7179adbac806e4)
Merge pull request #18761 from nullaus/v1.4

Merge pull request #18698 from nullaus/bug999511