Merge "Drop extraneous entries from install diffs" into main