Merge pull request #15382 from totten/5.18-note-event