More debugging for the snapshots.
Merge branch 'test' into dev