Update default.xml
Update default.xml
Merge remote-tracking branch 'upstream/jb4.2' into jb4.2