Backport

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

Closes #3623385

Merge request reports