Merge "BufferItemConsumer: Make creation calls flag-agnostic" into main