Merge pull request #2311 from apache/master

Sync master to release branch for NB 12.1-beta3