Merge "Determine restore operation type through RestoreSet" into sc-dev