Merge branch 'jc/worktree-config' into maint