Merge "Fix flag dependency" into main