Merge pull request #13235 from royalhuang/issue_13230