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