Fix remaining diff.
Remove other diff.
Merge branch 'master' into feature/server
Change blocking TCP to old way