Merge pull request #13438 from mingshewhe/bug_13103