Merge stable/cfo-1579-42a02b81-c7d8-4464-a890-e1f7c8959d64 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical