Merge "Check transaction queues when dropping or queuing buffers" into sc-dev