Merge pull request #1685 from rase-/fix/remote-address-in-handshake-obj

Fix remote address in handshake obj