Merge "Fix missing group alertOverride recalculation" into sc-v2-dev