Storage hotfix

Merge storage hotfix to master branch