Merge pull request #4118 from apache/delivery

 Sync delivery to release140 for 14-rc4