Backport of 2951814

Alex Pottrequested to merge
issue/drupal-2951814:2951814-10.4.x into 10.4.x

Closes #2951814

Merge request reports