Merge stable/cfo-2440-e8ce4a52-212a-40a2-b84e-ad5e577c0e10 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical