Merge stable/cfo-2118-9aaebe46-c93b-441b-952d-12c37ddf53c8 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical