Merge pull request #5944 from apache/delivery

Sync delivery to release180 for 18-rc4