Merge pull request #13428 from useryuyu/issue_13427