Merge "Fix BufferReleaseChannel flagging." into main