Merge "Don't reset AZR condition when user updates a rule" into main