Resolve #3377310 "11.x"

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

Closes #3377310

Merge request reports