Merge "SnapshotManager expose no space error"