Resolve #3576326 "Update drupal deprecation"

Closes #3576326

Merge request reports

Loading