Allow to build OTP 17.0
Refactor client-common