ISPN-3002 Fix RpcManager API