Merge pull request #13462 from mingshewhe/bug_13459