Merge pull request #3483 from apache/delivery

Sync delivery to release130 for 13-rc2