Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev