CRAFTERCMS-370: Notifier improvements