Backport

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

Closes #3623407

Merge request reports