Fixed  snapshot size calculation code.
Merge branch 'test' into dev