Merge stable/cfo-2634-c7e57a6f-fe97-479c-8f57-80b27c550826 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical