Merge pull request #13437 from useryuyu/issue_13429