Merge branch 'ky/branch-d-worktree' into maint