Merge "While-idle alarm timeout & EBS"