Backport notification delays from master