Merge dev/cfo-2239-ffb98965-b48e-477b-b714-f9e515257be2 into development

https://honeycomb.jira.com/browse/CFO-2239

Code Review

- [ ] @importantguy
- [ ] @supercritical