Merge branch 'refs/heads/t/abtract_sockets'