Merge "RpcServer: be thread safe"