Resolve #3188375 "D11"

Pierre Rudloffrequested to merge
issue/drupal-3188375:3188375-d11 into 11.x

Closes #3188375

Merge request reports