Fixed issue with multiple disable-enable action which were leading to multiple events subscriptions. Using emissary.
Changelog added
Merge branch 'fix-multiple-disabling-issue' into develop