OTP 17.0 (merge upstream eproxus:master)