Flip times on notification and event routines...whoops

Sam Clark requested to merge dev into master

Merge request reports