merged changes from xsd2bb