Merge branch 'gb/filter-branch-progress'