Merge pull request #13388 from useryuyu/issue_161503660