Merge branch 'kb/maint-filter-branch-disappear'