Basic TCP connection wrapper
Merge branch 'release/2.3.1'