Merge "Fix crash when measuring storage." into oc-dev