Code adapted to new XML format, OLDXML not yet tested but should still work
Authored by: paulatz 2017-06-14
Parent: [r266]
Child: [r268]