Merge "Blast: Use a unique id to track buffers" into sc-dev