Merge branch 'release/3.3.0' into develop
Fix setup
Update version
Merge branch 'release/3.3.1'