Fixed problem with snapshots that did not get deleted after a rollback.
Merge branch 'test' into dev