B-62422: XSD Update and test.