Moved the new Notifier statement.
Merge branch 'notifierfix' into develop