Version bump for release
Merge branch 'release/v3.0.2.0' into develop