Merge stable/cfo-3082-6b4d4fe3-d5aa-4160-b3ed-d90459aa6976 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical