Merge "Fix failure in CowTest#InvalidMergeOrderTest." into main