Merge stable/cfo-3483-e6883cbb-e4f8-4376-b6a7-e02214a90f32 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical