Merge branch 'develop' into release/v0.10.1

frontend/src/container/FormAlertRules/RuleOptions.tsx

@@ -156,6 +156,8 @@ function RuleOptions({
 								...alertDef,
 								condition: {
 									...alertDef.condition,
+									op: alertDef.condition?.op || defaultCompareOp,
+									matchType: alertDef.condition?.matchType || defaultMatchType,
 									target: value as number,
 								},
 							});