Merge "Populate the "new" fields in implicit ZenRules" into main