Merge "Performance Improvement: Temporal event"