Merge branch 'socks-support' into merged