update telnet
merge dev telnet