Merge "Enable code item deduping"