Merge "Fix flag configuration" into main