Indexer works
Merge remote-tracking branch 'origin/xcolab_refactoring' into xcolab_refactoring