Resolve #3606411 "Drupal classresolver"

Michael Strelanrequested to merge
issue/drupal-3606411:3606411-drupal-classresolver into main

Closes #3606411

Merge request reports