refactored & fixed plugin signals
Merge pull request #3405 from o-zander/fix/plugin-signals

refactored & fixed plugin signals