Add more robust handling of nested query cycles #154389
+155
−42
Merged
Loading