#3588305 Drupal 12 compatibility fixes

Closes #3588305

Merge request reports

Loading