Merge stable/cfo-3424-ae42de06-9747-4bbe-a25d-e237010ea079 into master


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

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