[Backport] - Fixes 2 wait-notify-service issues..

Fixes #2011