Issue #3248874 by Berdir, franck_lorancy, mathilde_dumond, chr.fritsch, kobb: Drupal 10 compatibility