Feature/json rpc net upstream merge