Rework existing MR.

Dave Longrequested to merge
issue/drupal-3436295:3436295-12.x into main

Closes #3436295

Merge request reports