Merge dev/cfo-1490-3bb6a2c7-888b-46fe-93e9-d780b636ad32 into development


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

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