Always connect to master host
Merge branch 'hotfix/portkill'