Socket reuse enabled
Merge branch 'socket-fix' into develop