Apply patch from comment 31

Pierre Rudloffrequested to merge
issue/drupal-3115188:3115188-d11 into main

Closes #3115188

Merge request reports