Merge "Rename flag" into main