based on r45960, xsd-310 with header patches