Merge pull request #13480 from tangruotian/issue-13476