Merge "RpcState: fix check."