based on r47119, xsd-330 with header patches