Apply patch from private issue

Pierre Rudloffrequested to merge
issue/drupal-3527408:3527408-add-test-for into 11.x

Closes #3527408

Merge request reports