Merge "Fix: Guice creation error in Reindex"