Draft: Resolve #3386474 "Omnibus2"

catchrequested to merge
issue/drupal-3386474:3386474-omnibus2 into main

Closes #3386474

Merge request reports