Merge pull request #16 from apache/next-release

Merge changes for 2.1.0 into main branch