Converted the patch in #2 and added tests

David Cameronrequested to merge
issue/drupal-2633232:2633232-missing-fallback-plugins into main

Closes #2633232

Merge request reports