Add wakeup checker in-process
Fix conflicts