Merge pull request #13448 from mingshewhe/bug_13447