Resolve #3252278 "11.x"

Brad Jonesrequested to merge
issue/drupal-3252278:3252278-11.x into main

Closes #3252278

Merge request reports