Merge pull request #13452 from fcfang123/issue-12805-2