Merge stable/cfo-3973-3d25391a-14c0-499d-91db-efc932e29876 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical