Merge "Un-deprecate AutomaticZenRule constructor" into main