add struct to replace parallel arrays consolidate flushed & unflushed buffers
Merge remote-tracking branch: upstream/master