Merge change 9631

* changes:
  Make test_backup and test_restore usable again