Merge stable/cfo-2379-15389c5f-ad4d-4e6c-8658-adab6a504568 into master


##### JIRA Link with Reproduction Steps
https://honeycomb.jira.com/browse/CFO-2379

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