Merge "Use "real" free space; refresh on large changes." into oc-dev