Backport

catchrequested to merge
issue/drupal-3045509:3045509-11x into 11.x

By: dcam By: amateescu (cherry picked from commit 49e355fc)

Closes #3045509

Merge request reports