Drupal 10 compatibility fixes
Creating a merge request from a patch: https://www.drupal.org/files/issues/2023-04-24/3286522-d10-compatibility-7.patch
Creating a merge request from a patch: https://www.drupal.org/files/issues/2023-04-24/3286522-d10-compatibility-7.patch