Merge change 6067

* changes:
  recognize when plugin is eligable for user events and then notify the plugin.