Merge commit 'de72697b771d33738c5f9d6c28087504e0796622' * commit 'de72697b771d33738c5f9d6c28087504e0796622': FileRestoreHelper and RestoreHelperDispatcher work.