Merge "Fix pulse wake-up transition"