Avoid blocking the routing loop indefinitely.
Merge branch 'bug/notify-contact' into dev