3.6/ross event fixes

https://www.planbox.com/stories/7683206
https://www.planbox.com/stories/7683224
https://www.planbox.com/stories/7683225
https://www.planbox.com/stories/7683227