Merge pull request #678 from anthropics/claude/merge-pr-669-d73N4

Resolve merge conflict in add-plugin/intercom vs staging