Merge branch 'kn/ref-filter-branch-list' into maint