Squashed the event handler memory leak insurrection
Squashed the event handler memory leak insurrection
Fix
Merge Conflict