Patch to fix multiple client PM's with the proxy support added