Merge change 817 into donut

* changes:
  Hide the backup stuff for now