Merge stable/cfo-3929-ab00dfe6-ed65-48a1-826f-cb39d05a4daf into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical