Merge "Add routing sockets for the requesting user"