Merge branch 'routexmlAPI'