Resolve #3483599 "Patchreroll1"

nicxvanrequested to merge
issue/drupal-3483599:3483599-patchReroll1 into 11.x

Closes #3483599

Merge request reports