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