Merge "Make deduplication order non-null"