Resolve #2769407 "For 11"

Joseph Olstadrequested to merge
issue/drupal-2769407:2769407-for-11 into main

Closes #2769407

Merge request reports