CFO-1234 -> master |

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

##### Issuer
Tim Kretschmer

##### 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.

- [ ] @tim-kretschmer-c2fo - Tim Kretschmer
- [ ] HipChat user  "@FakeUser" is not mapped to a GitHub user