Merge pull request #10142 from annando/event-notice