Merge "Allow BlastBufferQueue to acquire an additional buffer" into sc-dev