Merge stable/cfo-3723-f82f11a6-6836-4a89-a718-4a1fbbbf3b66 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical