fix xml import/export
Merge branch 'upstream23' into reviewed23