Merge pull request #2090 from TheBlueMatt/2023-03-mon-wake-bp