Merge branch 'tg/grep-no-index-fallback'