Merge "Add checked and expanded subtype to intdef and toString" into main