Fixed disk listing for snapshot calculation.
Merge branch 'test' into dev