Merge dev/cfo-1450-9b1e4e4b-93bf-4cea-8676-1de49f99cb00 into development

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

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