Merge stable/cfo-1671-ca960bab-fb56-441e-bdaa-531684546be0 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical