Merge branch 'socket-set-33337'