Merge pull request #13348 from mingshewhe/bug_13313