Merge stable/cfo-3566-514c0dae-d8f7-4468-924b-d91b7b7d4d31 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical