Merge pull request #2060 from ludovic-henry/socket-rework-async