Merge stable/cfo-2739-0ae303e0-ce58-4380-96c7-d3e3f10b8107 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical