[3.9] Improve live notifier