Resolve #3446713 "Drupal 11 compatibility fix"

Samit Khulverequested to merge
issue/flag-3446713:3446713-drupal-11-compatibility-fix into 8.x-4.x

Closes #3446713

Merge request reports