Merge pull request #4581 from apache/otp-26-compat

OTP 26 compatibility