Unifying storage key
Merge pull request #1113 from darkwing/draft-update

Unifying storage key