Merge stable/cfo-3941-1bb7d035-9d40-428b-9677-ddeaeb5f0fc5 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical