Fixes added manually on top of bot's changes

Balu Ertlrequested to merge
issue/eva-3430343:3430343-automated-drupal-11 into 3.0.x

Closes #3430343

Merge request reports