Draft: Resolve #3485896 "Donquixote suggested changes part3"

Andreas Henningsrequested to merge
issue/drupal-3485896:3485896-donquixote-suggested-changes-part3 into 11.x

Closes #3485896

Merge request reports