Merge "Add MLD type offset definition" into main