Drupal 11 compatibility code changes

Closes #3430368

Merge request reports

Loading