storage api change
Merge remote-tracking branch 'origin/storageAPI-chuyu'