Drupal 11 fixes

Closes #3580008

Merge request reports

Loading