Resolve #3054641 "11.x"

Michael Vanettarequested to merge
issue/drupal-3054641:3054641-11.x into main

Closes #3054641

Merge request reports