Merge branch 'lc/filter-branch-too-many-refs'