Update default.xml

pull tracking changes from upstream