Merge configuration from add_proxy_authentication_required topic branch