Bump version
Merge branch 'release/v2.0.2' into develop