storage draft added
Merge branch 'hotfix/indexMove' into develop