Add multi-server mode
Merge branch 'hc-dev' into socket
Fix some issues with multi-server mode.