Merge "Add IGMP type offset definition" into main