Issue #3347343: Backport to 10.4

Scott Euserrequested to merge
issue/drupal-3347343:3347343-10-4-x-backport into 10.4.x

Backports be7c988b to #3347343

Merge request reports