Merge branch 'jk/grep-no-index-fix'