Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev