DFXML updates from upstream repo