Merge pull request #13361 from mingshewhe/bug_13356