Draft: Resolve #3390360 "3414655"

spokjerequested to merge
issue/drupal-3390360:3390360-3414655 into 11.x

Closes #3390360

Merge request reports