3575821 backport

Stephen Mustgraverequested to merge
issue/drupal-3575821:3575821-backport into 10.6.x

Closes #3575821

Merge request reports