Update default.xml
Merge upstream