Close socat process at end of the test
Merge branch 'release/v0.2.16'