Merge "Remove duplicate entry in IntDef" into sc-dev