Merge pull request #13365 from mingshewhe/feat_13309