Merge "Add new state to AutomaticZenRule" into main