WINDUP-222: Initial prototype of XML syntax.
WINDUP-222: Add lost commit
WINDUP-222: Fixes after 1st rebase
WINDUP-222: Fix test failures after merge.