Storage refactoring
deploy script
Revert "deploy script"

This reverts commit 18e4eba94acd934e62bc6238af339d9e4c09a466.
Merge branch 'master' into develop