Fixed bug in snapshot deletion.
Merge branch 'test' into dev