Cherry-pick from @smledbetter with conflict resolution and project-specific reference removed. Co-Authored-By: Stevo <smledbetter@users.noreply.github.com> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Cherry-pick from @smledbetter with conflict resolution and project-specific reference removed. Co-Authored-By: Stevo <smledbetter@users.noreply.github.com> Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>