Merge "Consistent "low storage" behavior." into oc-dev