[Reviewer: Graeme] Ralf events

Completing previous partial merge.