Merge "Fix getAutomaticZenRules to use proper conversion" into main