Merge "Block on BufferReleaseChannel when out of buffers" into main