Merge pull request #13442 from mingshewhe/feat_13423