Added storage utils and tests
Merge remote-tracking branch 'origin/master'
Added storage utils and tests
Merge remote-tracking branch 'origin/master'