based on r41757, xsd-310 with header patches