Merge dev/cfo-2736-cb77177c-59fe-489b-a93f-e7f70a5960a5 into development

[JIRA Link with Reproduction Steps](https://honeycomb.jira.com/browse/CFO-2736)

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