Merge stable/cfo-1003-4b5c2bcf-49aa-4d05-9376-32fd17bd5c98 into master


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

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