Revised event ongoing conditions.
Note: a similar change was done in the 3.4.x branch in parallel, this commit will not be used in official.