Added handling for local and remote snapshots on a rollback.
Merge branch 'test' into dev