Merge stable/cfo-2687-b48ca179-5367-4de6-8ca8-3fd621ddb053 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical