Merge pull request #12202 from seamuslee001/event_core_117