Snapshots now have a uuid when read directly.
Merge branch 'test' into dev