new branch for STF 407 because of missing tool support for XSD