Merge "Revert "Capture event log""