merged 0018-proxy_mode.patch