Merge "Remove outfile flag as it's unused and all callers migrated"