XML and name clean up
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop