BUG-614: convert NotificationBrokerImpl