Backport

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

Closes #3583516

Merge request reports