Merge "Add a flag to a previous API change." into main