Merge stable/cfo-2221-bba292bc-9211-480a-aea0-b4175c7a0a2b into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical