Merge branch 'es/worktree-forced-ops-fix'