Merge pull request #13399 from tangruotian/issue-13398