Resolve #3582093 "Backport"

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

Closes #3582093

Merge request reports