Trait approach

nicxvanrequested to merge
issue/drupal-3492391:3492391-with-trait into main

Closes #3492391

Merge request reports