Merge branch 'mh/blame-worktree' into maint