Merge "Update intdef mapping." into main