Merge stable/cfo-2940-f718fc9d-8cb5-4f22-9c82-32e958826a56 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical