Fixed bug in restore of new snapshots.
Merge branch 'test' into dev