RPC upscope

* Re-base previous pull request as discussed with David