Merge "BBQ: add a counter for pending buffers" into sc-dev