Merge stable/cfo-3987-65ae8572-4bde-4e01-b0b8-b6ca301901d3 into master


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

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