Merge branch 'kf/http-proxy-auth-methods'