Merge "Update zen rule type selection and view."