Merge pull request #2146 from apache/master

Sync master to release 12.0 beta 5