Merge "Configurable wake-up delay"