Merge pull request #22064 from crdlc/bug-1041291-v2

Bug 1041291 v2(cherry picked from commit c72257b2d27135bfcd68e89dd584182797784016)