Resolve #3571046 "Use tagged iterators"

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

Closes #3571046

Merge request reports