Pull in dfxml development changes