Merge pull request #13440 from mingshewhe/bug_13430