version in manifest
Merge branch 'release/2.0' into develop