Drupal 11 compatibility update and general fixes

Closes #3543323

Merge request reports

Loading