based on r44601, xsd-310 with header patches