Merge branch 'dev' into sockets