Merge "Rewrite Reindex around projects"