Merge branch 'socket' into transsock