Merge pull request #13364 from mingshewhe/feat_13363