based on r42561, xsd-310 with header patches