based on r47119, xsd-310 with header patches