Merge branch 'jc/maint-clean-nested-worktree-in-subdir'