#3257230: Skipped rows are processed continuously at each batch iteration

reroll patch #16 - needs work (tests)

Patch: https://www.drupal.org/files/issues/2022-01-11/3257230-16.patch