Merge "Use correct timestamps of events for logging." into oc-dev