Merge "Fix typo in @intdef" into sc-dev