OTP-15328
