Merge dev/cfo-2013-bbadccd6-0601-499c-976e-167975aea5e8 into development

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

Code Review

- [ ] @importantguy
- [ ] @supercritical