based on r45210, xsd-310 with header patches