Still some events are missing in this instance (cherry picked from commit d0f9ace67970f51bd1e9fb153a0844555f2b1ca2)