Merge stable/cfo-3416-7f63b492-7439-4baa-912b-91ac09a55ab3 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical