Merge pull request #4506 from apache/delivery

Sync delivery to release150 for 15-rc4