Merge pull request #13425 from fcfang123/issue-13424