Merge branch 'jk/filter-branch-come-back-to-original' into maint