Merge pull request #19137 from mlutfy/eventNotices