Rebase 0003-notify-calling-process-we-are-ready-to-serve.patch