Ipmlement handshake prototype behind a feature flag