Fix bug that prevented running plugins standalone
Merge remote-tracking branch 'upstream/develop' into develop