Elastic indexer performance improvements

Merged Valery Sizov requested to merge elastic_indexer into master