Merge "Fix wake up regression"