Merge dev/cfo-1866-430688f5-c809-4b4b-b38d-908306ea1e48 into development

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

Code Review

- [ ] @importantguy
- [ ] @supercritical