S72258 - Support Proxy Server - DO NOT MERGE