made changes to BlobManager to work well with renaming
Merge origin/master