Resolve #2973515 "D11"

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

Closes #2973515

Merge request reports