Merge "RESTRICT AUTOMERGE Logging for alarms when they hit the limit" into rvc-dev