Merge "Unify storage calculations." into oc-dr1-dev