Update beta.2.0
Merge branch 'update-beta.2.0'