Merge stable/cfo-2960-0685f68c-4eff-4c14-9a9b-01347dc9c339 into master

#### JIRA Link with Reproduction Steps
https://honeycomb.jira.com/browse/CFO-2960

#### Code Review + Discussion Complete
If any user has commented on this PR, but has not checked his or her box below, then the PR cannot be merged.

- [ ] @importantguy
- [ ] @supercritical