Merge change 7435

* changes:
  Ensure that everything gets backed up at least once