Reroll patch from https://www.drupal.org/project/drupal/issues/3338057 to drupal 10.3

Carlos Rincon Sanchezrequested to merge
issue/drupal-3338057:3338057- into 10.3.x

Closes #3338057

Merge request reports