Backport

Michael Strelanrequested to merge
issue/drupal-3496319:3496319-10.5.x into 10.5.x

Closes #3496319

Merge request reports