Resolve #2903456

Jonathan Shawrequested to merge
issue/drupal-2903456:2903456-1 into 9.0.x

Closes #2903456

Merge request reports