based on r46131, xsd-330 with header patches