Merge pull request #3514 from apache/delivery

Sync delivery to release130 for 13-rc3