Merge change 7945

* changes:
  Clean up when an attempted restore throws