Combine two MRs

catchrequested to merge
issue/drupal-3386474:2024-07-testing into main

This reverts commit ae344f2e.

Closes #2024

Merge request reports