2852463 Rolling Patch from #114 into issue fork

Open Michael Lutz requested to merge issue/drupal-2852463:2852463-create-a-trait into 9.2.x

Closes #2852463

Merge request reports