Merge branch 'paulmaxwell/storage-bundle'