optimize xml report
Merge branch 'develop'