Merge pull request #13380 from mingshewhe/feat_10553