refs #496 - RPC enhancements