Apply patch from comment #34

Pierre Rudloffrequested to merge
issue/drupal-3121172:3121172- into main

Closes #3121172

Merge request reports