Merge pull request #83 from apache/sync-v2-to-master

Sync v2 to master