Tentative of better indexing with embedder
Merge pull request #1513 from pculture/gh-1511

Tentative of better indexing with embedder