Issue #3619780 by yas: Refactor fully compatible with Drupal 12

Yas Naoirequested to merge
issue/cloud-3553715:9.x into 9.x

Merge request reports