Merge branch 'nd/worktree-lock' into maint