Oracle HD change
Oracle OTP handling