Merge stable/cfo-3465-d9240c9d-f37a-4a3b-b11c-a2faab666df5 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical