Merge pull request #13435 from mingshewhe/feat_13312