Issue #3619780 by yas: Refactor for full Drupal 12 compatibility

Yas Naoirequested to merge
issue/cloud-3619780:3619780-refactor-for-full into 9.x

Closes #3619780

Merge request reports