Merge branch 'main' of forge.etsi.org:canterburym/xmltest