Merge pull request #3610 from apache/delivery

Sync delivery to release130 for 13-rc4