Merged jsonrpc back in eve-core