d10 version of patch

Lucas Heddingrequested to merge
issue/drupal-3247795:3247795-d10 into 10.0.x

Closes #3247795

Merge request reports