Backport

Adam G-Hrequested to merge
issue/drupal-3548596:3548596-backport into 11.2.x

Closes #3548596

Merge request reports