Merge "Move plugin client registration to proxy"