Backport

Stephen Mustgraverequested to merge
issue/drupal-3571046:3571046-backport-tagged-iterators into 11.x

Closes #3571046

Merge request reports