Merge "SF: fix BufferTX counter for null buffers" into sc-dev