Merge "Replace broken flag" into main