Merge stable/cfo-1006-7b949a02-0d0f-4c15-8c08-d18f6c174528 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical