Draft: #3405976 "With 3421164"

catchrequested to merge
issue/drupal-3405976:3405976-with-3421164 into 11.x

Closes #3405976

Merge request reports