Fixed rollback of snapshots.
Merge branch 'test' into dev