Fixed handling of snapshot size on load.
Merge branch 'test' into dev