Restore events added in #3220 that were lost due to regresssion, fixes #4841