Draft: #3597964: Drupal 12 compatibility fixes

Closes #3597964

Merge request reports

Loading