Drupal 1383696 82 11.x

Joseph Richardsonrequested to merge
issue/drupal-1383696:drupal-1383696-82-11.x into 11.x

Rebased on 11.x and looking to target 11.x on a merge instead of main

Merge request reports