Merge "Storage API polishing." into oc-dev