Merge dev/cfo-2053-31c5fe94-3b64-41af-befa-91e2aaa4e044 into development

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

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