Merge branch 'net-handshake-fixes'