Merge pull request #3473 from apache/delivery

Sync delivery to release130 for 13-rc1