fix: core patch for https://www.drupal.org/project/drupal/issues/3377310

Christopher Kirk requested to merge feature/core_patch_3377310 into master Dec 01, 2023