as a plugin with restartable actor system
Merge remote-tracking branch 'origin/master'