Merge pull request #1126 from carlosmn/indexer-buffer indexer: move the temporary buffers into the indexer object