Changing the socket
Merge remote-tracking branch 'origin/development/architecture' into development/architecture