Merge dev/cfo-1828-32cf406b-f5c6-458f-ba9d-435f205d1c41 into development


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

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