Merge stable/cfo-2130-3888739b-6f4a-41e7-b6ab-95d8034843fb into master


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

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