Merge branch 'dp/filter-branch-prune-empty' into maint