Merge "Drop TODO for flag enablement" into main