upgrade xml validation
Merge branch 'release'