OTP-17536
