Merge dev/cfo-2519-bacc1e52-917d-41e9-941a-f93dddf57d0f into development

[JIRA Link with Reproduction Steps](https://honeycomb.jira.com/browse/CFO-2519)

##### Code Review + Discussion Complete
If any user has commented on this PR, but has not checked his or her box below, then the PR cannot be merged.

- [ ] @importantguy
- [ ] @supercritical