Merge branch 'master' into develop
Makes root user available via TCP/socket
Merge branch 'master' into develop