Resolve #3556506 "Backport"

Stephen Mustgraverequested to merge
issue/drupal-3556506:3556506-backport into 11.x

Closes #3556506

Merge request reports