Merge "Remove errant semicolon from end of IntDef annotation" into main