Merge branch 'socket-communication'