Reversed xml import order.
Merge branch 'test' into dev