Issue #3448883 by just_like_good_vibes: Automated Drupal 11 compatibility fixes for virtual_base + small improvements