Merge branch 'hotfix/runsync'
Always connect to master host
Merge branch 'hotfix/portkill' into develop