based on r42528, xsd-310 with header patches