Merge Yang's RPC changes.