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