Merge dev/cfo-2424-f2ae93b5-7971-4745-8256-2a9f8807e488 into development


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

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