Merge dev/cfo-1234 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical