Merge "Moved info about activeBuffer into bufferInfo (2/2)"