Backport

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

Closes #3618256

Merge request reports