DE596 - Fix defect where questions not appearing in XML
Merge branch 'integration' into integration-work