Merge from master
tree: 56c8484c8239dcf8de29aa652a601aa977bdc338
  1. default.xml