Resolve #343535 "11.x"

Gaël Gossetrequested to merge
issue/drupal-343535:343535-11.x into 11.x

Closes #343535

Merge request reports