Cleanup
Merge branch 'hotfix/3.0.1'