Merge "Fix flag check" into main