add file name resovler
merge blobcontent branch
fix unit tests problem
Merge branch 'blobcontent' into alpha