Draft: Resolve #3600889 "11.x"

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

Closes #3600889

Merge request reports