Patch does not apply https://git.drupalcode.org/project/drupal/-/merge_requests/6945.diff