backport

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

Closes #3582153

Merge request reports