Drupal 9/10 compatible

Closes #3379580

Merge request reports

Loading