Merge "Treat manual zen rule more like automatic rules" into main