Merge branch 'release/3.0.0' into develop
Fix types
Update version
Merge branch 'release/3.0.1'