Draft: Resolve #3496369 "Plus 3518179"

catchrequested to merge
issue/drupal-3496369:3496369-plus-3518179 into 11.x

Closes #3496369

Merge request reports