Resolve #3622391 "Use tagged iterators in"

Dave Longrequested to merge
issue/drupal-3622391:3622391-use-tagged-iterators-in into main

Closes #3622391

Merge request reports