Drupal 10 compatibility fixes

Closes #3297293

Merge request reports

Loading