EVENT-153

@ryancarlson ready for review
Could you add a comment with a short description of what is happening and why?