Merge branch 'jk/filter-branch-no-index'