Resolve #3612498 "Full discovery"

Dave Longrequested to merge
issue/drupal-3612498:3612498-full-discovery into main

Closes #3612498

Merge request reports