Merge from master
tree: 2e9c20bcbf402504c8dd491730b0f837ac77080f
  1. default.xml