Update OTP's maint branch