Merge "Fix typedef retention" into main