fix: avoid popContext
on unvisited node paths
#16305
+55
−4
Merged