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