Merge stable/cfo-3869-8294a40f-6090-45cc-9121-b8a24f0b1b68 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical