Merge branch 'tc/missing-http-proxyauth'