LPS-43937 Reduce the NotificationHandler implementation to use the new base class