Merge stable/cfo-2145-0c6d768c-c10b-455c-9b01-8fad11689e39 into master


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

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