blobserver merge with upstream