Support for activation of signals
Merge branch 'origin/master'