Merge "Add a flag" into main