Merge branch 'ft-XMLReader' into dev