Merge "Follow storage API polishing." into oc-dev