Merge "Delete snapshots after restore is done successfully (1/n)" into rvc-dev