Merge branch 'v2.0-dev' as v2.0.0