Merge branch 'hotfix/2.0.1'
Server port fallback
2.0.1 released
Merge branch 'master' into dev