Merge branch 'socket-factory' into all-of-the-pull-requests
Merge branch 'socket-wait-abstraction' into all-of-the-pull-requests