Merge 2.0-trunk to master

Merge 2.0-trunk to master