Merge stable/cfo-3532-757e54dd-8aa2-48bb-bf0c-eb31edec8446 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical