Merge pull request #4150 from apache/delivery

Sync delivery to release140 for 14-rc6