Merge pull request #1698 from ludovic-henry/socket-reorg-2