Fixed bug with unknown xml fields.
Merge branch 'test' into dev