Merge "Keep the flag entries sorted." into main