Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9' * commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9': Make RestoreHelper and friends also write out the snapshot state.
Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9' * commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9': Make RestoreHelper and friends also write out the snapshot state.