trivial-sockets_until-i-can-merge-with-the-mainline