Include OTP when we move to GA