Merge dev/cfo-2018-8f523e4f-685f-4a2d-b0f5-43e137ac8c13 into development

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

Code Review

- [ ] @importantguy
- [ ] @supercritical