Merge "Fix gNumProxies double increment."