Fix factory
Merge branch 'socket-factory' into all-of-the-updated-pull-requests