Merge pull request #13374 from mingshewhe/chore_13373