Merge pull request #13439 from mingshewhe/feat_13013