Add ServerIP subchannel
Null check
Merge branch 'vemacs-master'