Before merging buffered_reader to master