Merge pull request #2159 from apache/master

Sync master to release 12.0 beta 6