Merge pull request #2809 from TheBlueMatt/2023-12-closing-event-cleanup-fixes