Draft: Resolve #3390360 "3457781 maintenance update"

spokjerequested to merge
issue/drupal-3390360:3390360-3457781-maintenance-update into 11.x

Closes #3390360

Merge request reports