Fixes #1914
Fixes #1411
Fixes #637 Note: This PR does *not* actually raise the event; it merely adds support for it