Implement handshake prototype behind a feature flag