Merge pull request #2330 from apache/master

Sync master to release121 for 12.1-beta4