Merge dev/cfo-2026-f5680d8d-43dd-445a-9831-ec965bcb8995 into development

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

Code Review

- [ ] @importantguy
- [ ] @supercritical