Fixed bug in XML deleteion.
Merge branch 'test' into dev