Merge stable/cfo-2128-1dde43a0-4bdf-4e95-8765-23f27819cbc4 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical