Merge "Reduce min time to alarm." into rvc-dev