Drupal-12 Upgrade fixes

Closes #3597666

Merge request reports

Loading