Merge pull request #13443 from mingshewhe/bug_13405