Merge pull request #13445 from mingshewhe/perf_13444