Merge pull request #4452 from apache/delivery

Sync delivery to release150 for 15-rc3