Adding mediator_rpc
merged master