Merge pull request #898 from juherr/issue-#809

Activate XML valiation that should avoid issues like #809