Merge "Add missing BufferItem->BLAST items"