Merge "Fix flag intdef"