Merge stable/cfo-1189-e4e952c9-896c-4569-85f5-bf433320b29e into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical