merged 0020-proxy-chaining.patch