Fix bugs in telnet handling.
Merge branch 'release_30' into release_31

Fix bugs in telnet handling.
Merge branch 'release_31' into development

Fix bugs in telnet handling.