based on r43857, xsd-310 with header patches