Added blob by context query
Added a test object factory
Fixed the upstream merge issue