More fixes for snapshot size calculation.
Merge branch 'test' into dev