Merge branch 'vsock-fixes'