B-43834 broken code due to xsd changes