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