Merge "ART: Fix another potential N-th visitor issue" into lmp-dev