Backport drupal static and reset deprecation

Closes #3037054

Merge request reports

Loading
Loading