Merge change 1040 into donut

* changes:
  Add a test app for the backup