Merge "Created bufferInfo to track buffer data in a single place (1/2)"