Merge branch 'stable-2.8'

* stable-2.8:
  Inject right plugin name @PluginName in init step