Decorator pattern

Brad Jonesrequested to merge
issue/drupal-2347867:2347867-race-conditions-with into main

Closes #2347867

Merge request reports