Changes from CM. Added size on disk, related to diffs