Merge "Fix flag declaration" into main