Fixed another bug in the tcp handler.
Merge branch 'test' into dev