Merge change 4524 into donut

* changes:
  FileRestoreHelper and RestoreHelperDispatcher work.