Fix loading of plugin events on Create Plugin screen
Fix loading of plugin events on Create Plugin screen

Merge remote-tracking branch 'origin/pr/704' into develop

* origin/pr/704:
  Fix loading of plugin events on Create Plugin screen