Merge pull request #18628 from mcb30/openconnect-proxy