Merge "Fix reference to ProxyInfo extra"