Merge stable/cfo-3660-2a796404-29f4-4d5a-8b91-c08324d998af into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical