Merge pull request #13359 from mingshewhe/bug_13292