IGNITE-15275 Fix handshake operation (#265)

6 files changed