Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint