Merge stable/cfo-3658-4c07cb0b-039d-4e48-b5ef-611be53f560c into master

[JIRA Link with Reproduction Steps](https://honeycomb.jira.com/browse/CFO-3658)

##### 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