Merge "Fix wrong IntDef flag"