Merge pull request #17322 from apache/fix-13154