Merge stable/cfo-3966-07206363-0938-4e10-a0b3-adbc503b10ca into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical