Merge pull request #2939 from TheBlueMatt/2024-03-no-wake-on-shutdown-121