Merge branch 'main' into worktree-claude-acp-0751